From: Glenn Morris Date: Wed, 7 Jul 2021 15:04:03 +0000 (-0700) Subject: Merge from origin/emacs-27 X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~18^2~2185 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=90c89e8bdeca61aceae79e4c60a9a51800574914;p=emacs.git Merge from origin/emacs-27 fbf1cb2bf2 (origin/emacs-27) Fix overfull hbox in Emacs manual fda60094a2 Minor copyedits of Emacs manual # Conflicts: # doc/emacs/display.texi --- 90c89e8bdeca61aceae79e4c60a9a51800574914 diff --cc doc/emacs/display.texi index f6c422aa906,dfd3a5a43d4..ae345c11df5 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@@ -1189,8 -1181,8 +1189,8 @@@ that has some special meaning for forma program. To activate the fill-column indication display, use the minor modes - @kbd{M-x display-fill-@-column-indicator-mode} and - @kbd{M-x global-display-fill-column-indicator-mode}, which enable -@code{display-fill-column-indicator-mode} and ++@code{display-fill-@-column-indicator-mode} and + @code{global-display-fill-column-indicator-mode}, which enable the indicator locally or globally, respectively. Alternatively, you can set the two buffer-local variables